Browse Source

add 'rome' as next testnet, include meetings etc from discarded PR

bwhm 5 years ago
parent
commit
74909cf0b8

+ 7 - 8
README.md

@@ -29,12 +29,10 @@
     <a href="https://github.com/Joystream/helpdesk/blob/master/README.md">
       Helpdesk
     </a>
-    <!--
     <span> | </span>
-    <a href="/testnets/acropolis">
-      Acropolis Testnet
+    <a href="/testnets/rome">
+      Rome Testnet
     </a>
-    -->
   </h3>
 </div>
 
@@ -122,13 +120,10 @@ Until the Joystream mainnet goes live, a sequence of test networks will be rolle
 
 [Acropolis](/testnets/acropolis/README.md)
 
-<!--
-
 ## Next Testnet
 
-[Acropolis](/testnets/acropolis/README.md)
+[Rome](testnets/rome)
 
--->
 
 ## Past Testnets
 
@@ -159,6 +154,8 @@ Meeting itineraries are prepared on a case by case basis, depending on the conte
 
 ### Meeting Types
 
+*updates needed*
+
 #### Daily standup
 
 - **Description:** Everyone states, within 1 minute, what they accomplished the prior day, and what the goals are for the day. After this, people can start separate calls which need not be conducted in plenum.
@@ -286,6 +283,8 @@ All releases have the following branding materials, which should be summarised i
 
 ### Testnet Directory
 
+*updates needed*
+
 All releases should have a corresponding _release directory_ in the `/testnets` directory of this repo, and it should have the following structure:
 
 - `RELEASE_NAME`

+ 14 - 6
meetings/README.md

@@ -7,11 +7,17 @@
   <h5>The line between bureaucracy and rigour is 1px thin, but what are we to do? :pray:</h5>
 </div>
 
-# Table of contents
+Table of Contents
+=================
 
+<!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
 - [Meeting Archiving](#meeting-archiving)
 - [Archive Index](#archive-index)
 - [Itinerary Template](#itinerary-template)
+  - [Short Meeting Identifier](#short-meeting-identifier)
+<!-- TOC END -->
+
+
 
 # Meeting Archiving
 
@@ -23,11 +29,13 @@ This is the index of past meetings with itineraries, they should all be stored i
 
 | Meeting Identifier                             | Invitation sent  | Scheduled   (held)    | Itinerary and Minutes                              | Notes                         |
 | :-----------------------------------------: | :---------------:|-----------------------| :------------------------------------------------: | :----------------------------:|
-| Acropolis Launch Meeting                    | 24.04.19         | 26.04.19-12:15GMT+2 (x) | [link](../meetings/acropolis#launch-meeting)       |              -                |   
-| Acropolis User Stories Meeting              | 26.04.19         | 02.05.19-12:15GMT+2 (x) | [link](../meetings/acropolis#user-stories-meeting) | Rescheduled from 30.04        |
-| Acropolis Release Plan Finalization Meeting | 06.05.19         | 09.05.19-11:15GMT+2 (x)  | [link](../meetings/acropolis#release-plan-finalisation-meeting) | Two working days not feasible |
-| Acropolis Release Plan Milestone Evaluation Meeting | 10.06.19         | 11.06.19-11:15GMT+2 (x)  | [link](../meetings/acropolis##release-plan-milestone-evaluation-meeting) | Re-evaluation of Milestones due to changing circumstances |
-| Acropolis - Lessons Learned | 01.07.19         | 02.07.19-11:15GMT+2 (x)  | [link](../meetings/acropolis##lessons-learned) | Lessons learned after release |
+| Rome User Stories Meeting                           | 10.07.19         | 16.07.19-11:00GMT+2 (x) | [link](../meetings/rome#user-stories-meeting)                            | Due to complexity and logistics, the meeting took place over several days |  
+| Rome Launch Meeting                                 | 09.07.19         | 09.07.19-11:30GMT+2 (x) | [link](../meetings/rome#launch-meeting)                                  |              -                |  
+| Acropolis - Lessons Learned                         | 01.07.19         | 02.07.19-11:15GMT+2 (x) | [link](../meetings/acropolis##lessons-learned)                           | Lessons learned after release |
+| Acropolis Release Plan Milestone Evaluation Meeting | 10.06.19         | 11.06.19-11:15GMT+2 (x) | [link](../meetings/acropolis##release-plan-milestone-evaluation-meeting) | Re-evaluation of Milestones due to changing circumstances |
+| Acropolis Release Plan Finalization Meeting         | 06.05.19         | 09.05.19-11:15GMT+2 (x) | [link](../meetings/acropolis#release-plan-finalisation-meeting)          | Two working days not feasible |
+| Acropolis User Stories Meeting                      | 26.04.19         | 02.05.19-12:15GMT+2 (x) | [link](../meetings/acropolis#user-stories-meeting)                       | Rescheduled from 30.04        |
+| Acropolis Launch Meeting                            | 24.04.19         | 26.04.19-12:15GMT+2 (x) | [link](../meetings/acropolis#launch-meeting)                             |              -                |   
 
 # Itinerary Template
 

+ 570 - 0
meetings/rome/README.md

@@ -0,0 +1,570 @@
+Table of contents
+=================
+
+<!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
+- [Planned Meetings](#planned-meetings)
+  - [Release Plan Finalization Meeting](#release-plan-finalization-meeting)
+    - [Agenda](#agenda)
+    - [Minutes](#minutes)
+  - [Release Checklist Meeting](#release-checklist-meeting)
+    - [Agenda](#agenda-1)
+    - [Minutes](#minutes-1)
+  - [Lessons Learned](#lessons-learned)
+    - [Agenda](#agenda-2)
+    - [Minutes](#minutes-2)
+- [Conducted Meetings](#conducted-meetings)
+  - [Launch Meeting](#launch-meeting)
+    - [Agenda](#agenda-3)
+    - [Minutes](#minutes-3)
+  - [User Stories Meeting](#user-stories-meeting)
+    - [Agenda](#agenda-4)
+    - [Minutes](#minutes-4)
+<!-- TOC END -->
+
+# Planned Meetings
+
+## Release Plan Finalization Meeting
+
+- **ID:** `Rome Release Plan Finalization Meeting`
+- **Date:** `dd.mm.yy`
+- **Starts:** `hh:mm GMT+2`
+- **Scheduled Duration:** `min`
+- **Venue:** `ZOOM`
+- **Lead**: `NA`
+- **Minutes**: `NA`
+- **Participants**:
+  - `name1`
+  - ...
+
+### Agenda
+#### Item 1
+...
+
+
+### Minutes
+**Started at:** `hh:mm GMT+2`
+**Present:**
+  - `name1`
+  - ...
+
+#### Item 1
+...
+
+**Other topics raised:**
+...
+
+**Ended at:** `hh:mm GMT+2`
+
+---
+
+## Release Checklist Meeting
+
+- **ID:** `Rome Release Checklist Meeting`
+- **Date:** `dd.mm.yy`
+- **Starts:** `hh:mm GMT+2`
+- **Scheduled Duration:** `min`
+- **Venue:** `ZOOM`
+- **Lead**: `NA`
+- **Minutes**: `NA`
+- **Participants**:
+  - `name1`
+  - ...
+
+### Agenda
+#### Item 1
+1. Review the [Release Checklist](../../testnet#release-checklist) draft, and compare to the release plan.
+2. Land a final Release Checklist, that contains all items, and sorted it in order of deployment.
+
+
+### Minutes
+**Started at:** `hh:mm GMT+2`
+**Present:**
+  - `name1`
+  - ...
+
+#### Item 1
+...
+
+**Other topics raised:**
+...
+
+**Ended at:** `hh:mm GMT+2`
+
+
+---
+
+## Lessons Learned
+
+- **ID:** `Rome Lessons Learned`
+- **Date:** `dd.mm.yy`
+- **Starts:** `hh:mm GMT+2`
+- **Scheduled Duration:** `min`
+- **Venue:** `ZOOM`
+- **Lead**: `NA`
+- **Minutes**: `NA`
+- **Participants**:
+  - `name1`
+  - ...
+
+### Agenda
+#### Item 1
+...
+
+
+### Minutes
+**Started at:** `hh:mm GMT+2`
+**Present:**
+  - `name1`
+  - ...
+
+#### Item 1
+...
+
+**Other topics raised:**
+...
+
+**Ended at:** `hh:mm GMT+2`
+
+# Conducted Meetings
+
+## Launch Meeting
+
+- **ID:** `Rome Launch Meeting`
+- **Date:** `10.07.19`
+- **Starts:** `11:30 GMT+2`
+- **Scheduled Duration:** `45min`
+- **Venue:** `ZOOM`
+- **Lead**: `Martin`
+- **Minutes**: `Martin`
+- **Participants**:
+  - `Alex`
+  - `Bedeho`
+  - `Martin`
+  - `Mokhtar`
+
+### Agenda
+#### Item 1
+Discuss draft Rome [release plan](../../testnets/rome).
+
+#### Item 2
+Discuss draft [release OKR](/okrs#release-okrs).
+
+#### Item 3
+Schedule [user stories meeting](#user-stories-meeting)
+
+### Minutes
+**Started at:** `11:30 GMT+2`
+**Present:**
+  - `Alex`
+  - `Bedeho`
+  - `Martin`
+  - `Mokhtar`
+
+#### Item 1
+1. Went through the draft Release plan point by point
+2. Points that were unclear, inaccurate, missing or wrong, was corrected or marked for change.
+
+#### Item 2
+1. Martin presented a draft OKR, with an emphasis on a proposed new way of making, tracking and grading the KRs using github issues, as discussed in the [Acropolis Lessons Learned Meeting](../acropolis#lessons-learned).
+    - In practice, it meant breaking down each KR into tasks
+    - The tasks would be sorted by the affected parties/repos, and a checkbox would accompany each task.
+    - Each task could (optionally) be assigned a weighting, to get an objective tracking of the progress.
+        - Each KR issue would also include an objective and pre-defined formulae for finally grading the KR. This would not necessarily be mapped to the same tasks.
+    - Each Monday, all affected parties would have a meeting, evaluating progress and checking off completed tasks.
+    - A summary of that weeks meeting, alongside a tracking grade, would be added as comment by the release manager.
+    - This summary would be presented on the [Weekly All Hands](https://github.com/Joystream/joystream#monday-all-hands), which would be moved to Tuesday.
+
+2. The general sentiment was that the concept seemed like an improvement in certain areas, but the presented draft was not sufficient to convince all attendees that it sufficiently addressed the problems with the old release OKR system.
+
+3. Attendees shall present proposals to what the KRs should cover.
+
+
+#### Item 3
+
+This was not addresssed.
+
+**Other topics raised:**
+NA
+
+**Ended at:** `15:00 GMT+2`
+
+---
+
+## User Stories Meeting
+
+- **ID:** `Rome User Stories Meeting`
+- **Date:** `16.07.19`
+- **Starts:** `11:00 GMT+2`
+- **Scheduled Duration:** `1h30min`
+- **Venue:** `ZOOM`
+- **Lead**: `Martin`
+- **Minutes**: `Martin`
+- **Participants**:
+  - `Alex`
+  - `Bedeho`
+  - `Martin`
+  - `Mokhtar`
+
+### Agenda
+
+Review and discuss Users Stories.
+Note that during the meeting, it was decided to change the order of discussion due to time constraints. These changes are reflected below.
+
+---
+
+#### 1. General Signup
+
+NB1: provider refers to either storage provider or distributor.
+
+NB2: These stories are kind of hand wavy. Many of the stories may be better suited off chain, e.g. coordinated through a server run by conductor. But it remains to be seen.
+
+##### As a prospective provider I want to
+- see terms associated with existing providers roles
+- see terms associated with open positions for new roles
+- apply to an open position with one click
+- one click download each auto generated key (stash, controller, session) for each role applied to
+- get notified if accepted into a position
+- see list of all positions I have occupied now and prior, and corresponding payouts, and circumstances of leaving.
+- get notified if slashed
+- get notified if evicted
+- leave a role
+
+
+
+##### As a Conductor I want to
+- add an open position with given terms
+- close an open position
+- slash a provider from a position
+- evict a provider from a position
+- get in touch with a provider out of band
+- add obligation to provider
+- remove obligation from provider
+- quickly determine if a new accepted provider is correctly configured
+
+---
+
+#### 2. Apollo
+
+##### As a prospective provider I want to
+- start Apollo with given keys
+- stop Apollo
+- see Apollo session status of node
+- see Apollo recent usage log
+
+---
+
+#### 3. Colossus
+
+##### As a node operator I should be able to:
+- (Stake) Configure and enter storage role entirely from the command line, in an interactive process, where only essential secret keys are required on the node running the storage node software.
+- (Unstake) leave the role easily without loosing access to staked (stash) keys
+- Re-enter the role after unstaking without overwriting old staking keys
+- Get status of my node:
+  - Sync status, IPNS publishing status. Total storage consumed...
+- Get usage stats:
+   - number of objects served/uploaded, total data transferred
+- Check if there is a version update available
+- Enter a test mode - non operational mode for testing setup and configuration
+- Configure a remote IPFS node to use
+- Configure a remote endpoint as joystream full node
+- Gracefully shutdown node
+
+##### The node itself should:
+- Not enter operational status until chain is fully synced
+- Synchronize data objects over IPFS from other storage providers
+- Provide a REST API for receiving new data objects from publishers, and accepting transfers to distributors nodes
+- Provide a REST API for service resolution
+
+---
+
+#### 4. Content Directory
+
+These stories describe functionality of a general purpose Versioned Object Database system upon which the content directory for the platform will be constructed.
+
+##### As system sudo I can:
+- create a new `class group` x1
+- assign a `class group` sudo
+- have same permissions as class group sudo
+
+##### As `class group` sudo I can:
+- create a new Class
+- create a new Entity of an existing Class in my group
+- create a new Schema for a Class in my group, supporting use of an Object Property type that can map to a DataObjectID, of a specific DataObjectFamily from the Data Directory
+- create a new object of a specific schema for an existing Entity in my class group.
+- update the object properties of any object in my class group
+
+##### Any user of the platform can:
+- get a list of all classes, and entities
+- for each class get all its entities
+- for each entity get all versions of its object representation
+
+x1 - A `class group` is a logical grouping of Classes. It allows for segmenting the database and assigning different sudo accounts for different groups. A class group sudo can only create new classes and entities, under their group.
+
+Assume Database has following structure:
+Classes: `["Podcast", "PodcastTheme", "Episode", "Person"]`
+Schemas:
+```
+Podcast {
+  name: varchar(30),
+  host: Internal(Person),
+  // themes: Array(PodcastTheme) // array propertytype is not yet in spec
+  theme: PodcastCategory // might be limiting if a show fits in multiple categories
+}
+
+PodcastTheme {
+  name: varchar(30),
+}
+
+Person {
+  memberId: Option<External("Membership", 0)>,
+  email: varchar(150),
+}
+
+Episode {
+   podcast: Internal(Podcast),
+   title: varchar(50),
+   guest: Internal(Person), // Array ? guests
+   track: External("DataDirectory", DataObjectFamilyId = 0)
+}
+```
+
+##### In Pioneer a user should be able to:
+- browse list of `Podcast`s,
+- Sort podcasts by `Theme` or show host,
+- select a podcast and get a list of all `Episode`s
+- find episodes (from different shows) on which a guest appeared
+
+Should have similar stories for a `Movie` and associated classes. (Final list of content types to include in Rome is TBD)
+
+##### Stretch Goal
+- In Pioneer, anyone can use a tool to create a  *simple text formatted* description of a schema.
+- Sudo can use a command line tool to build an extrinsic that can create a new schema for a class.
+
+Instead of Arrays (eg. to add all guests that appeared on a show), we can have create a Class:
+```
+PodcastGuestAppearance {
+  episode: Internal(Episode),
+  guest: Internal(Person)
+}
+```
+
+---
+
+
+#### 5. Community Fund Proposal System
+
+##### As a platform member and stakeholder, I want
+- a community fund of real money.
+- to be able to make proposals and apply for grants.
+- to be able to propose competitions, and get paid to arrange them.
+- to be able to participate in competitions and win real money.
+- to be able to propose increasing participation payouts.
+- a forum category to discuss and evaluate proposals.
+- insight on what Council Members thinks about proposals.
+
+##### As a Council Member candidate, I want
+- to communicate to stakeholders how I would allocate the resources as part of my campaign.
+- show my constituency that I want to support their cause as part of my campaign.
+- show that I can make good proposals that would help build the community.
+- show that I can evaluate, improve and find flaws in other proposals.
+
+##### As a Council Member, I want
+- all of the above.
+- the ability to vote and allocate the funds.
+
+---
+
+### Minutes
+**Started at:** `11:00 GMT+2`
+**Present:**
+  - `Alex`
+  - `Bedeho`
+  - `Martin`
+  - `Mokhtar`
+
+**Note** All comments are in *italic*
+
+---
+
+#### Item 1
+
+NB1: provider refers to either storage provider or distributor.
+
+NB2: These stories are kind of hand wavy. Many of the stories may be better suited off chain, e.g. coordinated through a server run by conductor. But it remains to be seen.
+
+##### As a prospective provider I want to
+- see terms associated with existing providers roles
+- see terms associated with open positions for new roles
+- apply to an open position with one click
+- leave a role
+
+*It was decided to make the general `actor/working group` signup module small and generic. As a consequence, a lot of this will be off-chain. It was not resolved how much of this was going to be in Pioneer, and how to represent it.*
+
+
+##### As a Conductor I want to
+- add an open position with given terms
+- close an open position
+- slash a provider from a position *(without evicting, ie. only slash part of their stake)*
+- evict a provider from a position
+- add obligation to provider *(content)*
+- remove obligation from provider *(content)*
+- quickly determine if a new accepted provider is correctly configured
+
+*As above: It was decided to make the general `actor/working group` signup module small and generic. As a consequence, a lot of this will be off-chain. It was not resolved how much of this was going to be in Pioneer, and how to represent it.*
+
+
+##### Nice to haves
+- one click download each auto generated key (stash, controller, session) for each role applied to
+- get notified if accepted into a position *(email in node config was considered, or just wait for the chat system)*
+- see list of all positions I have occupied now and prior, and corresponding payouts, and circumstances of leaving.
+- get notified if slashed *(email in node config was considered, or just wait for the chat system)*
+- get notified if evicted *(email in node config was considered, or just wait for the chat system)*
+- get in touch with a provider out of band *(email in node config was considered, or just wait for the chat system)*
+
+*These stories were removed from the the "must haves" to "nice to haves"*
+
+---
+
+#### Item 2
+
+##### As a prospective provider I want to
+- start Apollo with given keys *(ie. use a session key, similar to running a joystream full node)*
+- stop Apollo
+- see Apollo session status of node *(similar to what "helios" already does)*
+- see Apollo recent usage log  *(This is/will be possible using the setup guide in helpdesk)*
+
+---
+
+#### Item 3
+
+##### As a node operator I should be able to:
+- Get status of my node:
+  - Sync status, IPNS publishing status.  *("Total storage consumed..." was moved to nice to have)*
+- Configure a remote IPFS node to use
+
+##### The node itself should:
+- Not enter operational status until chain is fully synced *(This refers to the joystream-node)*
+- Synchronize data objects over IPFS from other storage providers
+- Provide a REST API for receiving new data objects from publishers, and accepting transfers to distributors nodes
+- Provide a REST API for service resolution
+
+*The final three points are already existing functionality*
+
+##### Nice to haves
+- Check if there is a version update available
+- Get usage stats:
+   - number of objects served/uploaded, total data transferred
+- Enter a test mode - non operational mode for testing setup and configuration *x*
+- Configure a remote endpoint as joystream full node *x*
+*x these two combined would mean users could test on a "reckless" testnet*
+- Gracefully shutdown node *(Refers to announcing you are down for maintenance)*
+- Get status of my node:
+  - Total storage consumed...
+
+*These stories were removed from the the "must haves" to "nice to haves"*
+
+---
+
+This was as far as we got on the first meeting. The remaining items will be addressed at a later date.
+
+**Other topics raised:**
+
+While going through items 1-3, a recurring topic was how much time and effort should be put into making the products user friendly, compared to the "quantity" and "quality" of users affected.
+
+More specifically, should we optimize to make it easy for actors, that are well paid for a role, without actually risking anything (no "real" stake), or should we rather expect them to monitor communication channels and the status of their software. By making everything easily accessible in Pioneer, and adding new ways of communicating directly, we are adding a significant workload on ourselves.
+
+**Ended at:** `12:30 GMT+2`
+
+---
+
+**Day two:**
+**Started at:** `17.07.19 - 09:00 GMT+2`
+**Present:**
+  - `Alex`
+  - `Bedeho`
+  - `Martin`
+  - `Mokhtar`
+
+---
+
+#### Item 4
+
+These stories describe functionality of a general purpose Versioned Object Database system upon which the content directory for the platform will be constructed.
+
+##### As system sudo I can:
+- create a new `content directory sudo`
+- assign a `content directory sudo`
+
+ *implement group permission in a separate module*
+
+##### As `content directory sudo` I can:
+- create a new Class
+- create a new Entity of an existing Class in my group
+- create a new Schema for a Class, supporting use of an Object Property type that can map to a DataObjectID, of a specific DataObjectFamily from the Data Directory
+- create a new object of a specific schema for an existing Entity
+- update the object properties of any object
+- use a command line tool or the extrinsics app from pioneer to send a tx and create a new schema for a class.
+
+*The final point was moved from nice to haves, as there has to be some way of making these. Whether the first implementation should be done via, extrinsics in pioneer or a standalone CLI, is TBD*
+
+##### Any user of the platform can use Pioneer to:
+- get a list of all classes, and entities
+- for each class get all its entities
+- for each entity get all versions of its object representation
+
+*It was not settled whether this should be via "regular" chain state queries, or a new x*
+
+##### As an uploader I can:
+- create a subset of Entities and Objects which the permissions module will limit to Members
+- update a subset of Entities and Objects which permissions module will limit to content owner
+
+*Added so that uploaders can actually add metadata (such as "title" and "description" without extra permissions)*
+
+Assume Database has following structure:
+Classes: `["Podcast", "PodcastTheme", "Episode", "Person"]`
+Schemas:
+```
+Podcast {
+  name: varchar(30),
+  host: Internal(Person),
+  // themes: Array(PodcastTheme) // array propertytype is not yet in spec
+  theme: PodcastCategory // might be limiting if a show fits in multiple categories
+}
+
+PodcastTheme {
+  name: varchar(30),
+}
+
+Person {
+  memberId: Option<External("Membership", 0)>,
+  email: varchar(150),
+}
+
+Episode {
+   podcast: Internal(Podcast),
+   title: varchar(50),
+   guest: Internal(Person), // Array ? guests
+   track: External("DataDirectory", DataObjectFamilyId = 0)
+}
+```
+
+##### In Pioneer a user should be able to:
+- browse list of `Podcast`s, *(example)*
+- Sort podcasts by `Theme` or show host,
+- select a podcast and get a list of all `Episode`s
+- find episodes (from different shows) on which a guest appeared
+
+Should have similar stories for a `Movie` and associated classes. (Final list of content types to include in Rome is TBD)
+
+*The representation of this in pioneer is very much a WIP still*
+
+---
+
+#### Item 5
+
+Not addressed yet.
+
+---
+
+
+**Ended at:** `11:15 GMT+2`

+ 215 - 0
meetings/rome/img/meetings-cover.svg

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 882 300" style="enable-background:new 0 0 882 300;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C4C3C6;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#C4C3C6;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st5{fill:#010101;}
+	.st6{fill:none;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#B1B2B7;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#FDFDFD;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:#F9F9F9;}
+</style>
+<g id="Layer_4">
+	<path d="M876,209H6c-3.3,0-6-2.7-6-6V6c0-3.3,2.7-6,6-6h870c3.3,0,6,2.7,6,6v197C882,206.3,879.3,209,876,209z"/>
+</g>
+<g id="Layer_2">
+</g>
+<g id="Layer_3">
+</g>
+<g id="Layer_1">
+	<g>
+		<path d="M619.7,91.2c10.3,0.7,21.8,0.7,31.9,2.8c3,0.6,5.4,4.3,8,5.9c4.2,2.5,7.4,6.3,10.6,9.9c17.1,19.1,38.4,33.7,58.7,49.3
+			c8.3,6.4,16.8,13.5,19.8,23.5s-2.5,23.1-12.9,24.1c2.6,6,1.1,13.5-3.8,17.9s-12.5,5.2-18.2,2c4.2,5.9-1.5,14.7-8.6,16.4
+			c-7.1,1.6-14.3-1.5-20.9-4.5c0.4,6.8-7.3,11.8-14.1,11.2s-12.6-4.9-18-9.1c-8.9-6.9-17.7-13.7-26.6-20.6
+			c-16.7-12.9-34-26.6-43.3-45.6c-1.9-3.8-3.4-7.8-6.1-11.1c-2.4-2.8-5.5-4.9-8.5-6.9c-10.1-6.5-20.7-12.3-31.7-17.4
+			c5-10.2,10.1-20.4,15.5-30.4c3.8-7.1,17.3-30.4,17.3-30.4c8.6,2,15.4,7.3,22.8,9.5C601.1,90.4,610,90.5,619.7,91.2z"/>
+		<path class="st0" d="M700.8,236c-3.4,1.6-8.1-1.3-14.3-4.7c-4.1-2.2-35.2-21.6-35.2-21.6c1.3,2.6,27.4,20.6,26.1,23
+			c-1.5,2.8-5.5,6.2-6.6,6.3c-2,0.3-8.3-4.3-8.3-4.3c-21.2-14.8-33.2-24.8-49.3-45c-8.7-10.9-16.7-21.3-26.5-31.3
+			c-9.8-10-21.3-18.1-33.2-23.8c5.5-10,16.6-28.7,21.4-39.3c0.9-2,30.2,7.4,46.7,7.6c5.5,0.1,16.2,0.9,21.4,2.7c3.2,1.1,5.4,6,8,8.3
+			c23.4,20,49.6,38,72.9,58c0,0,9.6,7.9,11.2,10.1c2.7,3.5,7.3,7,4.7,11.9c-2.2,4-3.5,8.6-8.2,8.2c-1-0.1-49.1-27.6-52.8-29.3
+			c0,0,47.3,31.1,48.5,33.2c1.2,2.2,2.1,4.9,1.2,6.4c-1.8,3.1-2.6,6.2-6.1,8.4c-3.5,2.2-12.2-1.1-15.2-3.1c-3-2-44-26.1-44-26.1
+			s42.4,30.9,43,33.6C706.7,227.9,703.9,234.6,700.8,236z"/>
+		<path class="st1" d="M667.7,186.1c-9.8,8.5-10.2-8.2-3.1-13.4c2.9-2.1,8.6-2.8,9.9,2C675.5,178.1,670.1,184,667.7,186.1z"/>
+		<path class="st1" d="M683.8,166.3c-12.2,10.1-12.8-9.7-3.8-15.9c3.7-2.5,10.8-3.3,12.4,2.3C693.4,156.9,686.7,163.9,683.8,166.3z"
+			/>
+		<path class="st1" d="M658.9,193.5c0.7,2.1-0.6,4.2-1.9,5.9c-1.4,2-2.9,4.1-5.1,5.4c-2.2,1.2-5.2,1.2-6.9-0.6
+			c-0.6-0.7-1-1.7-0.7-2.7c0.1-0.4,0.4-0.8,0.6-1.1C647.1,197.7,656,184.6,658.9,193.5z"/>
+		<path d="M702.8,216.2c0,0,7.5-6.6,8.8-9l-6.8,10l5.9-5c0,0-2,4.3-3.5,6.8C707.2,219,702.5,219.5,702.8,216.2z"/>
+		<path d="M684.3,232.6c0,0,6.4-6.1,8.1-8.5c0,0-5.2,9-6,10L684.3,232.6z"/>
+		<path d="M660.2,239.1c0,0,6.4-6.1,8.1-8.5c0,0-5.2,9-6,10L660.2,239.1z"/>
+		<path d="M718.6,196c0,0,7.4-6.9,9.3-9.7c0,0-6,10.2-6.9,11.4L718.6,196z"/>
+		<path class="st1" d="M713.5,167.9c4.2,3.1,8.7,5.7,12.4,9.4c4.5,4.5,9.4,10.3,14.3,14.4c0.7-1.8-0.2-2.4-0.7-4.1s-2.6-4.2-3.8-5.5
+			c-4.9-5.2-9.2-9.3-14.9-13.7c-3.3-2.6-6.6-5.1-9.9-7.7c-1.2-0.9-7.9-7.3-9.1-6.7C697.7,156,713.5,166.9,713.5,167.9z"/>
+		<path class="st1" d="M571.1,103c0,0,49.3,15.2,57.9,14.3L642.5,99c0,0-8.6,7.4-40.1,1.5c0,0-20.5-5.3-27.5-5.2
+			C574.9,95.3,572.1,101.2,571.1,103z"/>
+		<path d="M588.4,164.5c4.4-3.6,18.9-4,21.2,3.7c1.2,4.1,1.5,10.1,0,14.2c5.5-1.5,11.4,0.3,15.9,3.8c4.5,3.5,4.1,11.1,0.8,15.7
+			c8.9-3.1,19.5,5.6,18.2,14.9c4.3-3.1,11-1.7,14.3,2.6c3.3,4.2,3.3,10.4,0.8,15.2c-2.5,4.7-7.2,8-12.3,9.7
+			c-1.5,0.5-7.9-1.2-9.8-2.9c-2.4-2.2-4.1-4.8-2.3-10c-3.8,4.9-11.5,6.3-16.8,3.1c-5.3-3.3-7.5-10.8-4.8-16.4
+			c-5.1,2.7-10.8,5.7-15.6,3c-1.2-0.7-6-5.3-6.8-6.5c-2.4-3.6-0.1-9.3,0.9-13.5c-1.2,2.6-6.5,4.4-9.4,3.1
+			c-13.6-6.1-12-13.7-5.9-24.6C580.5,172.9,584.4,167.7,588.4,164.5z"/>
+		<path class="st0" d="M604.3,175.5c0.2,0.7,0.3,1.4,0.1,2.1c-0.2,0.8-0.7,1.6-1.3,2.2c-3.5,4.5-7.3,8.9-11.2,13.1
+			c-1.2,1.3-2.5,2.6-4.2,3c-1,0.3-1.6-0.3-2.6-0.4c-2.6-0.2-4.1-1.8-5.5-4c-1.7-2.6,0.4-7.4,2-10C585.3,175.9,600,159,604.3,175.5z"
+			/>
+		<path class="st0" d="M613.2,189.7c2.2-0.4,4.6,0.1,6.3,1.6c1.7,1.4,2.5,3.5,2,5.6c-0.8,3.7-5.2,7.7-8,10.3c-2,1.8-4.4,5-7.1,5.2
+			c-2.7,0.2-5.2-0.6-6.9-2.7c-0.4-0.5-1.4-2-1.7-2.5c-0.9-2,2.5-7.5,3.9-9.2C604.6,194.7,608.7,190.5,613.2,189.7z"/>
+		<path class="st0" d="M630.4,209.9c1.9-0.5,4-0.2,5.6,1c1.6,1.2,2.6,3.4,2.3,5.4c-0.4,3.5-2.8,5.6-5.1,8.2c-1.6,1.8-3.8,4-6.1,4.4
+			c-2.3,0.4-4.2-0.2-5.9-2c-0.4-0.4-0.8-2.1-1.1-2.6c-0.9-1.8,0.1-4,1.2-5.7C623.5,215.4,626.5,211,630.4,209.9z"/>
+		<path class="st0" d="M648.4,223.7c1.6-0.3,3.3,0.1,4.5,1.2c1.2,1.1,1.9,2.9,1.5,4.6c-0.6,2.8-1.2,2.6-3.2,4.5
+			c-1.4,1.4-2.7,3.3-4.6,3.5c-1.9,0.2-3.5-1.5-4.7-3.1c-0.3-0.4-0.6-0.7-0.7-1.1c-0.6-1.6,0.3-3.3,1.4-4.6
+			C644.7,226.1,645.2,224.3,648.4,223.7z"/>
+		<path class="st1" d="M602.7,170.5c1.5,0.9,1.8,4.3,1.7,4.6c-0.1,0.4-0.4,0.8-0.7,1.1c-2,2.3-3.4,4.3-5.6,6.4
+			c-0.7,0.6-2.3,1.4-3.2,1.7c-0.6,0.1-1.2,0.1-1.8,0c-1.5-0.1-3.2-0.3-4.1-1.4c-1-1.3-0.6-5.2,0.3-6.5
+			C591.4,173.5,595.3,166.1,602.7,170.5z"/>
+		<path class="st1" d="M637,209.4c1.1,0.7,1.9,3,1.8,3.3c-0.1,0.3-0.1,1.4-0.4,1.7c-1.5,1.8-2.5,3.4-4.3,5c-0.5,0.5-2.4,0.7-3.2,0.9
+			c-0.4,0.1-0.9,0.1-1.3,0c-1.1-0.1-2.5-0.2-3.1-1.1c-0.7-1-0.5-4.1,0.2-5.1C628.4,211.8,631.3,206,637,209.4z"/>
+		<path class="st1" d="M620.1,191.3c1.4,0.8,1.8,3.6,1.7,3.9c-0.1,0.4-0.4,0.7-0.7,1c-2,1.9-2.5,3-4.7,4.8c-0.7,0.5-3,1.9-3.9,2.1
+			c-0.6,0.1-1.1,0.1-1.7,0c-1.5-0.1-2.7-1.2-3.5-2.1c-1-1.1-0.5-4.3,0.5-5.4C609.7,193.1,611.9,186.3,620.1,191.3z"/>
+		<path d="M588.4,180.1c0,0,4.1,4.6,8.3,1.6l7.8-7.5l0.2,0.9l-6.6,7.4c0,0-3.5,3-7.4,1.3C587.8,182.7,588.4,180.1,588.4,180.1z"/>
+		<path d="M606.8,198.9c0,0,4.1,4.6,8.3,1.6l7.8-7.5l0.2,0.9l-6.6,7.4c0,0-3.5,3-7.4,1.3C606.2,201.4,606.8,198.9,606.8,198.9z"/>
+		<path d="M626.2,216.6c0,0,4.1,4.6,8.3,1.6l7.8-7.5l0.2,0.9l-6.6,7.4c0,0-3.5,3-7.4,1.3C625.6,219.2,626.2,216.6,626.2,216.6z"/>
+		<path d="M619.8,147.4c0,1,0.1,2.1,0.8,2.8c0.5,0.6,1.4,0.8,2.1,1.1c4.3,1.2,13.2,1.1,16.1-2.3c1.1-1.3,1.5-3.3,2.3-4.8
+			c3.7-7.7,4.6-11,6.6-18.1c0.7-2.4,1.8-1.9,3.2-3.9c1.4-2,3.9-5,5.5-6.8c2.2-2.5,1.9-3.4,3.7-6c0.4-0.6,1.3-0.9,2.1-0.9
+			c1,0,1.9,0.7,2.7,1.5c6.5,6.1,13.2,12.1,19.9,18c2.3,2.1,4.7,4.1,7,6.2c15.5,13.8,31,27.6,46.5,41.4c0.6,0.6,1.4,1.2,2.2,1
+			c0.7-0.1,1.2-0.8,1.6-1.4c4.4-6.9,7.3-15.4,14.1-20c2.6-1.8,5.7-2.9,8.6-4.1c4.9-2.1,9.5-4.8,13.8-7.9c0.6-0.4,1.2-0.9,1.6-1.5
+			c0.5-0.8,0.6-1.9,0.5-2.9c-0.5-8.2-6.6-12.9-10.2-20.3c-2.1-4.3-4.8-10.1-7.5-14c-1.4-2-2-4.3-3.3-6.3c-1.6-2.5-2.8-4.9-4.3-7.4
+			c-3.9-6.1-7.9-12.5-11.3-18.9c-9.2,3.9-16.4,6.9-25.6,10.9c-3.1,1.3-6.2,2.6-9.6,2.8c-3.2,0.1-6.3-0.8-9.3-1.7
+			C687,80.4,674,78,661.1,75.7c-2.2-0.4-4.4-0.8-6.5-0.3c-2.5,0.6-4.5,2.2-6.5,3.9c-8.4,7-19,13-27.4,20c-5.2,4.4-2.3,14.8-2,21
+			C619,129.3,619.4,138.4,619.8,147.4z"/>
+		<path class="st0" d="M637.4,135.9c1-5.2,2.1-10.3,4.5-15.2c2.5-5.1,3.5-6,5.9-11.5c1.8,0.8,4.3-1.5,5.8-0.9
+			c6.3,2.6,9.6,6.9,16.9,10.6c6.9,3.5,13.8,7.2,19.7,12.2c3.8,3.1,7.2,6.8,11.1,9.7c5,3.8,10.7,6.5,15.6,10.4
+			c6.2,4.9,9.2,9.2,15.2,14.6c1.6-6.3,6-8.9,11.7-12.2c2.7-1.6,8.9-5.9,11.7-7.4c2.9-1.5,4.6-2.8,7.2-4.8c1.1-0.8,7.1-1.9,7.1-3.3
+			c0-2.9-4.1-7.1-6.6-10.9c-8.4-12.5-15.5-25.6-23.3-38.7c-0.6-1-1.3-2-2.4-2.3c-0.9-0.3-1.9,0.1-2.8,0.4c-5.4,2.1-14,4.9-19.4,7
+			c-2.1,0.8-4.4,1.7-6.7,1.7c-2,0-4-0.7-5.9-1.4c-13.6-4.7-27.7-8-42-9.9c-1.7-0.2-3.4-0.4-5.1,0c-1.4,0.3-2.6,1.1-3.8,1.8
+			c-7.9,4.9-15.5,10.2-22.8,16c-1.3,1-2.6,2.2-3.2,3.7c-0.6,1.5-0.3,3.2,0,4.8c1.5,9.2-0.5,16.9,0.2,26.2c0.4,5.3,0.1,6.9,2.8,6.5
+			C632.1,142.6,636.9,138.4,637.4,135.9z"/>
+		<path d="M672.6,122.8c0,0,16.8,3.4,31.5,1.1c0,0-11.3,5.3-27.2,2.5L672.6,122.8z"/>
+		<path class="st1" d="M645.2,229.4c0,0,2.6,3.1,4.9,3c0,0,5.2-2.7,4.9-4.8s-3.9-5.5-7.8-3.7C647.2,224,645.1,226.8,645.2,229.4z"/>
+		<path d="M645,229.1c0,0,4.1,4.1,7.3,1.8l5.8-5.6l0.2,0.7l-5,5.6c0,0-3.2,2.3-6.6,0.4C644.7,230.7,645,229.1,645,229.1z"/>
+		<path class="st1" d="M626,124.6c0-0.8,0.9-1.1,1.2-0.4c0.6,1,1.4,4.4,1.7,7.4c0,0,0.2,8.9-1.4,11.2c-0.2,0.3-0.7,0.1-0.9-0.2
+			c-0.5-0.8-1.3-3.2-1.2-9.2L626,124.6z"/>
+		<path class="st1" d="M743.6,94.3c-1-1.5-3.1-4.3-3.8-5.7c-1.1-2-1.4-2.5-3.7-2.5c-8.2,2.1-16.4,6.4-24.4,8.8
+			c1.1,0.5,5.8,1.4,6.7,2.1c4.5,3.3,2.2,1.5,6.7,4.8c6.1-1.6,14-2.1,19.9-4.1c0.3-0.1,0.4,0,0.5-0.2L743.6,94.3z"/>
+		<path d="M646.9,111.9c0,0,0.9-5.6,0.8-9.1c0,0,1.4,5.4,1.3,6.5c0,0,2.5-1.7,2.3-3.7v6.3H646.9z"/>
+		<path class="st1" d="M636.3,102.4c1.4-0.4,2.7-1.2,4-2c4.1-2.6,8.3-5.2,12.4-7.8c2.3-1.4,4.6-2.9,7.2-3.5
+			c3.7-0.9,7.6,0.1,11.3,0.9c6.1,1.3,12.3,2.2,18.6,3.1c3.6,0.5,7.4,1,11,0.2c-13.2-4.1-26.4-8.2-40.2-9.2c-1.7-0.1-3.4-0.2-5,0.2
+			c-1.3,0.4-2.6,1.1-3.8,1.8c-4.2,2.5-8.3,5.1-12.4,7.8c-3.8,2.5-8.5,5-11.8,8.3C628.4,103.6,634.8,102.8,636.3,102.4z"/>
+		<path d="M626,124.6c0,0,1.6-0.9,2.2,2.5c0,0,0.9,5.1,0.8,7.9c0,0,1.5-7.2-0.9-12.3c0,0-2.9-2.9-5,0L626,124.6z"/>
+	</g>
+	<g>
+		<path class="st1" d="M64.1,100.6V67.4h6.7l9.4,28.1l9.4-28.1h6.7v33.2h-3.7V71.3h-0.7l-9.6,28.1h-4.1l-9.6-28.1h-0.7v29.3H64.1z"
+			/>
+		<path class="st1" d="M119.9,97.6l1.4-0.1l0.1,2.8c-3.6,0.5-6.8,0.8-9.4,0.8c-3.5,0-5.9-1-7.3-3c-1.4-2-2.2-5.1-2.2-9.3
+			c0-8.4,3.3-12.6,10-12.6c3.2,0,5.6,0.9,7.2,2.7c1.6,1.8,2.4,4.6,2.4,8.5l-0.2,2.7h-15.8c0,2.7,0.5,4.6,1.4,5.9
+			c1,1.3,2.6,1.9,5,1.9C115,97.9,117.4,97.8,119.9,97.6z M118.6,87.2c0-2.9-0.5-5-1.4-6.2c-0.9-1.2-2.5-1.8-4.6-1.8
+			c-2.1,0-3.7,0.6-4.8,1.9c-1.1,1.3-1.6,3.3-1.7,6.1H118.6z"/>
+		<path class="st1" d="M144.1,97.6l1.4-0.1l0.1,2.8c-3.6,0.5-6.8,0.8-9.4,0.8c-3.5,0-5.9-1-7.3-3c-1.4-2-2.2-5.1-2.2-9.3
+			c0-8.4,3.3-12.6,10-12.6c3.2,0,5.6,0.9,7.2,2.7c1.6,1.8,2.4,4.6,2.4,8.5l-0.2,2.7h-15.8c0,2.7,0.5,4.6,1.4,5.9
+			c1,1.3,2.6,1.9,5,1.9C139.2,97.9,141.6,97.8,144.1,97.6z M142.8,87.2c0-2.9-0.5-5-1.4-6.2c-0.9-1.2-2.5-1.8-4.6-1.8
+			c-2.1,0-3.7,0.6-4.8,1.9c-1.1,1.3-1.6,3.3-1.7,6.1H142.8z"/>
+		<path class="st1" d="M164.3,79.7h-7.6v11.5c0,2.8,0.2,4.6,0.6,5.4c0.4,0.9,1.4,1.3,2.9,1.3l4.3-0.3l0.2,3
+			c-2.1,0.4-3.8,0.5-4.9,0.5c-2.5,0-4.2-0.6-5.2-1.8c-1-1.2-1.4-3.5-1.4-7V79.7h-3.4v-3.1h3.4v-7.3h3.6v7.3h7.6V79.7z"/>
+		<path class="st1" d="M168.7,71.2V67h3.6v4.2H168.7z M168.7,100.6v-24h3.6v24H168.7z"/>
+		<path class="st1" d="M182.8,100.6h-3.6v-24h3.6v1.7c2.6-1.4,5.1-2.2,7.4-2.2c3.2,0,5.4,0.9,6.5,2.6c1.1,1.7,1.7,4.8,1.7,9.2v12.7
+			h-3.6V88c0-3.3-0.3-5.6-1-6.8c-0.7-1.2-2.1-1.8-4.2-1.8c-1,0-2.1,0.2-3.2,0.5c-1.1,0.3-2,0.6-2.6,0.9l-0.9,0.4V100.6z"/>
+		<path class="st1" d="M214.3,111.9c-3.8,0-6.5-0.5-8-1.6c-1.5-1-2.3-2.9-2.3-5.7c0-1.3,0.3-2.4,0.9-3.2c0.6-0.8,1.6-1.7,2.9-2.8
+			c-0.9-0.6-1.3-1.7-1.3-3.3c0-0.5,0.4-1.6,1.2-3l0.4-0.8c-2.5-1.2-3.8-3.6-3.8-7.2c0-5.5,3-8.2,9-8.2c1.5,0,3,0.2,4.3,0.5l0.7,0.1
+			l7.1-0.2v3.1l-4.6-0.1c1.1,1.1,1.6,2.7,1.6,4.8c0,3-0.7,5.1-2.2,6.3s-3.8,1.8-7,1.8c-0.9,0-1.6-0.1-2.4-0.2
+			c-0.6,1.4-0.9,2.3-0.9,2.7c0,1,0.3,1.6,0.9,1.8c0.6,0.2,2.4,0.4,5.5,0.4c3.1,0,5.3,0.5,6.6,1.4c1.3,1,2,2.8,2,5.6
+			C224.9,109.3,221.4,111.9,214.3,111.9z M207.5,104.4c0,1.7,0.5,2.9,1.4,3.5c0.9,0.7,2.7,1,5.2,1s4.4-0.4,5.5-1.1
+			c1.1-0.7,1.7-1.9,1.7-3.5c0-1.6-0.4-2.7-1.2-3.2c-0.8-0.5-2.4-0.7-4.7-0.7l-5.2-0.2c-1.1,0.8-1.8,1.4-2.1,2
+			C207.7,102.7,207.5,103.5,207.5,104.4z M207.8,84.3c0,1.9,0.4,3.2,1.3,4c0.8,0.8,2.2,1.2,4.2,1.2c2,0,3.3-0.4,4.2-1.2
+			c0.8-0.8,1.2-2.2,1.2-4.1c0-1.9-0.4-3.3-1.2-4.1s-2.2-1.2-4.2-1.2c-2,0-3.4,0.4-4.2,1.2C208.3,81.1,207.8,82.4,207.8,84.3z"/>
+		<path class="st1" d="M237.2,79.3c-3.5,0-5.2,1.2-5.2,3.6c0,1.1,0.4,1.9,1.2,2.4c0.8,0.5,2.6,0.9,5.5,1.4c2.8,0.5,4.9,1.2,6,2.1
+			c1.2,0.9,1.8,2.6,1.8,5c0,2.5-0.8,4.3-2.4,5.4s-3.9,1.7-6.9,1.7c-2,0-4.3-0.2-7-0.7l-1.4-0.2l0.2-3.1c3.6,0.5,6.4,0.8,8.3,0.8
+			s3.3-0.3,4.2-0.9c1-0.6,1.5-1.6,1.5-3c0-1.4-0.4-2.3-1.2-2.8c-0.8-0.5-2.7-1-5.5-1.4c-2.8-0.4-4.8-1.1-6-2
+			c-1.2-0.9-1.8-2.5-1.8-4.8c0-2.3,0.8-4.1,2.5-5.2c1.6-1.1,3.7-1.7,6.2-1.7c2,0,4.4,0.2,7.3,0.7l1.3,0.2l-0.1,3.1
+			C242.1,79.6,239.3,79.3,237.2,79.3z"/>
+	</g>
+	<g>
+		<path class="st0" d="M68.4,148.9h-6.9v-12.5h1.4v11.2h5.5V148.9z"/>
+		<path class="st0" d="M75.9,147.8l0.5-0.1l0,1.1c-1.4,0.2-2.5,0.3-3.5,0.3c-1.3,0-2.2-0.4-2.8-1.1s-0.8-1.9-0.8-3.5
+			c0-3.2,1.3-4.7,3.8-4.7c1.2,0,2.1,0.3,2.7,1s0.9,1.7,0.9,3.2l-0.1,1h-5.9c0,1,0.2,1.7,0.5,2.2c0.4,0.5,1,0.7,1.9,0.7
+			C74.1,147.9,75,147.9,75.9,147.8z M75.5,143.9c0-1.1-0.2-1.9-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7s-1.4,0.2-1.8,0.7
+			c-0.4,0.5-0.6,1.2-0.6,2.3H75.5z"/>
+		<path class="st0" d="M85.3,142.6v4.6c0,0.4,0.4,0.7,1,0.8l-0.1,1.1c-0.9,0-1.7-0.2-2.1-0.7c-1.1,0.5-2.2,0.7-3.2,0.7
+			c-0.8,0-1.5-0.2-1.9-0.7c-0.4-0.5-0.6-1.1-0.6-2s0.2-1.5,0.7-1.9c0.4-0.4,1.1-0.7,2.1-0.8l2.8-0.3v-0.8c0-0.6-0.1-1-0.4-1.3
+			c-0.3-0.3-0.6-0.4-1.1-0.4c-1,0-2,0.1-3,0.2l-0.6,0.1l-0.1-1c1.3-0.3,2.5-0.4,3.5-0.4c1,0,1.8,0.2,2.2,0.7
+			C85,140.9,85.3,141.6,85.3,142.6z M79.7,146.3c0,1.1,0.5,1.7,1.4,1.7c0.8,0,1.6-0.1,2.4-0.4l0.4-0.1v-3l-2.7,0.3
+			c-0.5,0-0.9,0.2-1.2,0.5C79.8,145.4,79.7,145.8,79.7,146.3z"/>
+		<path class="st0" d="M87.9,148.9v-9h1.3v1.2c1-0.7,2.1-1.2,3.3-1.4v1.4c-0.5,0.1-1,0.2-1.6,0.5s-1,0.4-1.3,0.5l-0.4,0.2v6.6H87.9z
+			"/>
+		<path class="st0" d="M95.5,148.9h-1.4v-9h1.3v0.6c1-0.5,1.9-0.8,2.8-0.8c1.2,0,2,0.3,2.4,1c0.4,0.6,0.6,1.8,0.6,3.5v4.8H100v-4.7
+			c0-1.2-0.1-2.1-0.4-2.6s-0.8-0.7-1.6-0.7c-0.4,0-0.8,0.1-1.2,0.2c-0.4,0.1-0.8,0.2-1,0.3l-0.3,0.2V148.9z"/>
+		<path class="st0" d="M109.1,148.9h-1.4V136h1.4v4.4c1-0.5,1.9-0.7,2.8-0.7c1.2,0,2,0.3,2.4,1c0.4,0.6,0.6,1.8,0.6,3.5v4.8h-1.3
+			v-4.7c0-1.2-0.1-2.1-0.4-2.6c-0.2-0.5-0.8-0.7-1.6-0.7c-0.8,0-1.5,0.1-2.2,0.4l-0.3,0.1V148.9z"/>
+		<path class="st0" d="M117.1,144.4c0-1.6,0.3-2.8,0.9-3.6c0.6-0.7,1.6-1.1,3-1.1c1.4,0,2.4,0.4,3,1.1c0.6,0.7,0.9,1.9,0.9,3.6
+			c0,1.6-0.3,2.8-0.8,3.6c-0.6,0.7-1.6,1.1-3,1.1s-2.5-0.4-3-1.1C117.3,147.2,117.1,146,117.1,144.4z M118.4,144.4
+			c0,1.3,0.2,2.2,0.5,2.8c0.3,0.5,1,0.8,2,0.8c1,0,1.7-0.3,2-0.8c0.3-0.5,0.5-1.4,0.5-2.8s-0.2-2.2-0.5-2.7c-0.3-0.5-1-0.7-1.9-0.7
+			s-1.6,0.2-1.9,0.7C118.6,142.2,118.4,143.1,118.4,144.4z"/>
+		<path class="st0" d="M126.1,139.9h1.4l1.8,7.8h0.3l2.1-7.7h1.4l2.1,7.7h0.3l1.8-7.8h1.4l-2.1,9h-2.2l-1.9-7l-1.9,7h-2.2
+			L126.1,139.9z"/>
+		<path class="st0" d="M143.8,139.9h1.4l1.8,7.8h0.3l2.1-7.7h1.4l2.1,7.7h0.3l1.8-7.8h1.4l-2.1,9H152l-1.9-7l-1.9,7h-2.2
+			L143.8,139.9z"/>
+		<path class="st0" d="M164.3,147.8l0.5-0.1l0,1.1c-1.4,0.2-2.5,0.3-3.5,0.3c-1.3,0-2.2-0.4-2.8-1.1s-0.8-1.9-0.8-3.5
+			c0-3.2,1.3-4.7,3.8-4.7c1.2,0,2.1,0.3,2.7,1s0.9,1.7,0.9,3.2l-0.1,1h-5.9c0,1,0.2,1.7,0.5,2.2c0.4,0.5,1,0.7,1.9,0.7
+			C162.5,147.9,163.4,147.9,164.3,147.8z M163.8,143.9c0-1.1-0.2-1.9-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7s-1.4,0.2-1.8,0.7
+			c-0.4,0.5-0.6,1.2-0.6,2.3H163.8z"/>
+		<path class="st0" d="M174.6,139.7c0.4,0,1.1,0.1,2,0.2l0.4,0.1l-0.1,1.1c-1-0.1-1.7-0.2-2.1-0.2c-1,0-1.7,0.2-2.1,0.7
+			s-0.5,1.4-0.5,2.7c0,1.3,0.2,2.2,0.5,2.7c0.3,0.5,1.1,0.8,2.1,0.8l2.1-0.2l0.1,1.1c-1.1,0.2-2,0.3-2.5,0.3c-1.4,0-2.4-0.4-2.9-1.1
+			s-0.8-1.9-0.8-3.6s0.3-2.9,0.9-3.6C172.3,140.1,173.2,139.7,174.6,139.7z"/>
+		<path class="st0" d="M178.6,144.4c0-1.6,0.3-2.8,0.9-3.6c0.6-0.7,1.6-1.1,3-1.1c1.4,0,2.4,0.4,3,1.1c0.6,0.7,0.9,1.9,0.9,3.6
+			c0,1.6-0.3,2.8-0.8,3.6c-0.6,0.7-1.6,1.1-3,1.1s-2.5-0.4-3-1.1C178.8,147.2,178.6,146,178.6,144.4z M180,144.4
+			c0,1.3,0.2,2.2,0.5,2.8c0.3,0.5,1,0.8,2,0.8c1,0,1.7-0.3,2-0.8c0.3-0.5,0.5-1.4,0.5-2.8s-0.2-2.2-0.5-2.7c-0.3-0.5-1-0.7-1.9-0.7
+			s-1.6,0.2-1.9,0.7C180.1,142.2,180,143.1,180,144.4z"/>
+		<path class="st0" d="M189.8,148.9h-1.4v-9h1.3v0.6c1-0.5,1.9-0.8,2.8-0.8c1.2,0,2,0.3,2.4,1c0.4,0.6,0.6,1.8,0.6,3.5v4.8h-1.3
+			v-4.7c0-1.2-0.1-2.1-0.4-2.6s-0.8-0.7-1.6-0.7c-0.4,0-0.8,0.1-1.2,0.2c-0.4,0.1-0.8,0.2-1,0.3l-0.3,0.2V148.9z"/>
+		<path class="st0" d="M205,136v12.9h-1.3v-0.6c-0.9,0.5-1.8,0.8-2.7,0.8c-0.5,0-0.9-0.1-1.3-0.2s-0.7-0.3-1-0.6
+			c-0.6-0.6-1-1.8-1-3.6s0.3-3,0.9-3.8c0.6-0.8,1.5-1.2,2.9-1.2c0.7,0,1.4,0.1,2.2,0.2v-4H205z M200.4,147.8
+			c0.2,0.1,0.5,0.1,0.8,0.1s0.7-0.1,1.2-0.2s0.8-0.2,1-0.3l0.4-0.2v-6.1c-0.8-0.1-1.5-0.2-2.1-0.2c-0.9,0-1.5,0.3-1.9,0.9
+			c-0.4,0.6-0.5,1.5-0.5,2.7c0,1.4,0.2,2.3,0.6,2.8C199.9,147.5,200.1,147.7,200.4,147.8z"/>
+		<path class="st0" d="M213.3,139.9h1.3v9h-1.3v-0.6c-0.9,0.5-1.8,0.8-2.7,0.8c-1.2,0-2-0.3-2.4-1c-0.4-0.6-0.6-1.8-0.6-3.5v-4.7
+			h1.3v4.7c0,1.3,0.1,2.2,0.3,2.6c0.2,0.4,0.7,0.7,1.5,0.7c0.4,0,0.8-0.1,1.2-0.2c0.4-0.1,0.7-0.2,0.9-0.3l0.3-0.2V139.9z"/>
+		<path class="st0" d="M220.6,139.7c0.4,0,1.1,0.1,2,0.2l0.4,0.1l-0.1,1.1c-1-0.1-1.7-0.2-2.1-0.2c-1,0-1.7,0.2-2.1,0.7
+			s-0.5,1.4-0.5,2.7c0,1.3,0.2,2.2,0.5,2.7c0.3,0.5,1.1,0.8,2.1,0.8l2.1-0.2l0.1,1.1c-1.1,0.2-2,0.3-2.5,0.3c-1.4,0-2.4-0.4-2.9-1.1
+			s-0.8-1.9-0.8-3.6s0.3-2.9,0.9-3.6C218.3,140.1,219.2,139.7,220.6,139.7z"/>
+		<path class="st0" d="M229.7,141.1h-2.9v4.3c0,1,0.1,1.7,0.2,2c0.1,0.3,0.5,0.5,1.1,0.5l1.6-0.1l0.1,1.1c-0.8,0.1-1.4,0.2-1.8,0.2
+			c-0.9,0-1.6-0.2-1.9-0.7c-0.4-0.5-0.5-1.3-0.5-2.6v-4.7h-1.3v-1.2h1.3v-2.8h1.3v2.8h2.9V141.1z"/>
+		<path class="st0" d="M236.7,148.9h-1.4v-9h1.3v0.6c0.9-0.5,1.8-0.8,2.6-0.8c1.1,0,1.9,0.3,2.3,0.9c0.4-0.2,0.9-0.5,1.5-0.6
+			c0.6-0.2,1.2-0.3,1.7-0.3c1.2,0,2,0.3,2.4,1c0.4,0.6,0.6,1.8,0.6,3.5v4.8h-1.3v-4.7c0-1.2-0.1-2.1-0.4-2.6s-0.8-0.7-1.5-0.7
+			c-0.4,0-0.8,0.1-1.2,0.2c-0.4,0.1-0.7,0.2-1,0.3l-0.3,0.2c0.2,0.4,0.2,1.3,0.2,2.6v4.7H241v-4.6c0-1.3-0.1-2.2-0.4-2.6
+			c-0.2-0.5-0.7-0.7-1.5-0.7c-0.4,0-0.8,0.1-1.2,0.2c-0.4,0.1-0.7,0.2-0.9,0.3l-0.3,0.2V148.9z"/>
+		<path class="st0" d="M256.5,147.8l0.5-0.1l0,1.1c-1.4,0.2-2.5,0.3-3.5,0.3c-1.3,0-2.2-0.4-2.8-1.1s-0.8-1.9-0.8-3.5
+			c0-3.2,1.3-4.7,3.8-4.7c1.2,0,2.1,0.3,2.7,1s0.9,1.7,0.9,3.2l-0.1,1h-5.9c0,1,0.2,1.7,0.5,2.2c0.4,0.5,1,0.7,1.9,0.7
+			C254.7,147.9,255.6,147.9,256.5,147.8z M256,143.9c0-1.1-0.2-1.9-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7s-1.4,0.2-1.8,0.7
+			c-0.4,0.5-0.6,1.2-0.6,2.3H256z"/>
+		<path class="st0" d="M265.6,147.8l0.5-0.1l0,1.1c-1.4,0.2-2.5,0.3-3.5,0.3c-1.3,0-2.2-0.4-2.8-1.1s-0.8-1.9-0.8-3.5
+			c0-3.2,1.3-4.7,3.8-4.7c1.2,0,2.1,0.3,2.7,1s0.9,1.7,0.9,3.2l-0.1,1h-5.9c0,1,0.2,1.7,0.5,2.2c0.4,0.5,1,0.7,1.9,0.7
+			C263.8,147.9,264.7,147.9,265.6,147.8z M265.1,143.9c0-1.1-0.2-1.9-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7s-1.4,0.2-1.8,0.7
+			c-0.4,0.5-0.6,1.2-0.6,2.3H265.1z"/>
+		<path class="st0" d="M273.2,141.1h-2.9v4.3c0,1,0.1,1.7,0.2,2c0.1,0.3,0.5,0.5,1.1,0.5l1.6-0.1l0.1,1.1c-0.8,0.1-1.4,0.2-1.8,0.2
+			c-0.9,0-1.6-0.2-1.9-0.7c-0.4-0.5-0.5-1.3-0.5-2.6v-4.7h-1.3v-1.2h1.3v-2.8h1.3v2.8h2.9V141.1z"/>
+		<path class="st0" d="M274.8,137.9v-1.6h1.4v1.6H274.8z M274.8,148.9v-9h1.4v9H274.8z"/>
+		<path class="st0" d="M280.1,148.9h-1.4v-9h1.3v0.6c1-0.5,1.9-0.8,2.8-0.8c1.2,0,2,0.3,2.4,1c0.4,0.6,0.6,1.8,0.6,3.5v4.8h-1.3
+			v-4.7c0-1.2-0.1-2.1-0.4-2.6s-0.8-0.7-1.6-0.7c-0.4,0-0.8,0.1-1.2,0.2c-0.4,0.1-0.8,0.2-1,0.3l-0.3,0.2V148.9z"/>
+		<path class="st0" d="M291.9,153.2c-1.4,0-2.4-0.2-3-0.6c-0.6-0.4-0.9-1.1-0.9-2.1c0-0.5,0.1-0.9,0.3-1.2c0.2-0.3,0.6-0.7,1.1-1
+			c-0.3-0.2-0.5-0.6-0.5-1.2c0-0.2,0.1-0.6,0.4-1.1l0.2-0.3c-0.9-0.4-1.4-1.3-1.4-2.7c0-2.1,1.1-3.1,3.4-3.1c0.6,0,1.1,0.1,1.6,0.2
+			l0.3,0.1l2.7-0.1v1.2l-1.7,0c0.4,0.4,0.6,1,0.6,1.8c0,1.1-0.3,1.9-0.8,2.4s-1.4,0.7-2.6,0.7c-0.3,0-0.6,0-0.9-0.1
+			c-0.2,0.5-0.3,0.9-0.3,1c0,0.4,0.1,0.6,0.3,0.7c0.2,0.1,0.9,0.1,2.1,0.1c1.2,0,2,0.2,2.5,0.5s0.8,1.1,0.8,2.1
+			C295.9,152.2,294.6,153.2,291.9,153.2z M289.4,150.3c0,0.6,0.2,1.1,0.5,1.3c0.4,0.2,1,0.4,2,0.4c1,0,1.6-0.1,2.1-0.4
+			c0.4-0.3,0.6-0.7,0.6-1.3s-0.2-1-0.5-1.2c-0.3-0.2-0.9-0.3-1.8-0.3l-1.9-0.1c-0.4,0.3-0.7,0.5-0.8,0.8
+			C289.4,149.7,289.4,150,289.4,150.3z M289.5,142.8c0,0.7,0.2,1.2,0.5,1.5c0.3,0.3,0.8,0.4,1.6,0.4c0.7,0,1.3-0.1,1.6-0.4
+			c0.3-0.3,0.5-0.8,0.5-1.5s-0.2-1.2-0.5-1.5c-0.3-0.3-0.8-0.5-1.6-0.5c-0.7,0-1.3,0.2-1.6,0.5C289.7,141.6,289.5,142.1,289.5,142.8
+			z"/>
+		<path class="st0" d="M300.5,140.9c-1.3,0-2,0.5-2,1.4c0,0.4,0.1,0.7,0.5,0.9c0.3,0.2,1,0.4,2.1,0.5c1.1,0.2,1.8,0.4,2.3,0.8
+			c0.4,0.3,0.7,1,0.7,1.9s-0.3,1.6-0.9,2c-0.6,0.4-1.5,0.6-2.6,0.6c-0.7,0-1.6-0.1-2.6-0.3l-0.5-0.1l0.1-1.2
+			c1.4,0.2,2.4,0.3,3.1,0.3c0.7,0,1.2-0.1,1.6-0.3c0.4-0.2,0.5-0.6,0.5-1.1c0-0.5-0.2-0.9-0.5-1.1c-0.3-0.2-1-0.4-2.1-0.5
+			c-1.1-0.2-1.8-0.4-2.2-0.7c-0.4-0.3-0.7-0.9-0.7-1.8s0.3-1.5,0.9-1.9c0.6-0.4,1.4-0.6,2.3-0.6c0.7,0,1.7,0.1,2.8,0.3l0.5,0.1
+			l0,1.2C302.3,141,301.3,140.9,300.5,140.9z"/>
+	</g>
+</g>
+</svg>

+ 1 - 55
okrs/README.md

@@ -56,61 +56,7 @@ TBD
 
 # Release OKRs
 
-## Objective: `Launch Acropolis Network`
-- **Active from:** 09.05.19
-- **KR Measurement Deadline**: 7-9 days after Acropolis launch (first weekday)
-- **Tracked**: Every Monday
-- **Tracking Manager**: Martin
-- **Key Results**:
-1. `Get 75 posts on forum (limits, not Jsg) (ewd)`
-    - Bedeho: 2/3
-    - Alex: 1/3
-2. `Forum (runtime), storage (runtime and P2P) fully specd (n)`
-    - Bedeho (as manager): 1/2
-    - Bedeho (as writer): 1/6
-    - Jens: 2/6
-      - Mokhtar from 10.06.19
-3. `Have 4x replication for all 2 tranches on storage node (ewd)`
-    - Jens: 2/3
-      - Mokhtar from 10.06.19
-    - Mokhtar: 1/3
-4. `95% uptime Storage Providers (ewd)`
-    - Jens: 1/4
-      - 0 from 10.06.19
-    - Mokhtar: 1/4
-      - 1/2 from 10.06.19
-    - Martin: 1/4
-    - Alex: 1/4
-5. `No PRs merged to master (excluding bugfixes and "pioneer") after "Sub-system Test" (conf)`
-    - Martin: 1/2
-    - Jens: 1/8
-      - 0 from 10.06.19
-    - Mokhtar: 1/8
-      - 1/6 from 10.06.19
-    - Bedeho: 1/8
-      - 1/6 from 10.06.19
-    - Alex: 1/8
-      - 1/6 from 10.06.19
-
-
-- **Notes**
-  * During the first tracking, it was decided to track KR5 by how confident (conf) each assigned individual is that the KR will be achieved.
-<br />
-
-- **Tracking:**
-
-| Date     | KR #1 | KR #2 | KR #3 | KR #4 | KR #5 |    Comments       |
-|:--------:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----------------:|
-| 13.05.19 |(0.55,0.65) **0.58**|(0.4,1,0.1) **0.4**|(0,0) **0**|(0,0,0,0) **0**|(0.5,1,0.5,0.95,0.95) **0.68**|KR3 tracking N/A as SoW must be finalized|
-| 20.05.19 |(0.6,0.8) **0.7**|(0.4,1,*0.1*) **0.4**|(*0*,0.1) **0.03**|(*0*,0,0,0) **0**|(0.5,*1*,0.25,0.95,0.95) **0.64**|  *n* denotes Jens' tracking (absent)|
-| 27.05.19 |(0.7,0.85) **0.78**|(0.4,1,0.9) **0.67**|(0,0.1) **0.03**|(0,0,0,0) **0**|(0.7,1,0.6,1,0.95) **0.79**|    -      |
-| 03.06.19 |(0.9,0.85) **0.88**|(0.4,1,0.95) **0.67**|(0.45,0.2) **0.37**|(0,0.2,0,0) **0.05**|(0.6,1,0.8,1,0.95) **0.77**|    **-**        |
-| 10.06.19 |(1.0,0.9) **0.95**|(0.4,1,0.95) **0.67**| (0.4) **0.4** |(0.85,0,0) **0.43**| `*` |`*` **Due to changes in circumstances, we chose abstain from tracking KR5**|
-| 17.06.19 |(0.99,0.97) **0.98**|(0.8,1.0,1.0) **0.9**|(0.49) **0.49**|(0.99,0.5,1.0) **0.85**|(0.65,0.95,0.3,0.7) **0.65**| - |
-| 24.06.19 |(1.0,1.0) **1.0**|(0.67,1.0,1.0) **0.83**|(0.5) **0.5**       |(0.9,0.8,1.0) **0.9**|(0,0.8,1.0,1.0) **0.47**  |   -        |
-| 03.07.19 | (1+7/75)x0.5 **0.55**| (2/3) **0.67**  | (1+0)x0.5 **0.5**| (1+0.5)x0.5 **0.75** | **0.5**   |Actual score|
-
-See [archive](archive/acropolis) for more details.
+TBD
 
 # Group OKRs
 

+ 12 - 6
testnets/README.md

@@ -1,13 +1,16 @@
 <p align="center"><img src="img/testnets.svg"></p>
 
-# Table of contents
+Table of Contents
+=================
 
+<!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
 - [Overview](#overview)
 - [Testnet Releases](#testnet-releases)
-    - [Live Testnet](#live-testnet)
-    - [Next Testnet](#next-testnet)
-    - [Past Testnets](#past-testnets)
+  - [Live Testnet](#live-testnet)
+  - [Next Testnet](#next-testnet)
+  - [Past Testnets](#past-testnets)
 - [Templates](#templates)
+<!-- TOC END -->
 
 
 # Overview
@@ -18,17 +21,20 @@ It also contains templates for for planning releases.
 
 ## Live Testnet
 
-[Athens](testnets/athens/README.md)
+[Acropolis](acropolis)
 
 ## Next Testnet
 
-[Acropolis](testnets/acropolis/README.md)
+[Rome](rome)
+
 
 ## Past Testnets
 
 | Network         | Started           | Ended         | Release Plan    |
 | -------------   | -------------     | -----         | -----           |
+| Athens          | 27.04.19          |   24.06.19    | [Link](athens)  |
 | Sparta          | 28.02.19          |   29.03.19    |       NA        |
 | Mesopotamia     | 21.12.18          |   28.02.19    |       NA        |
 
+
 # Templates

+ 20 - 0
testnets/rome/branding/README.md

@@ -0,0 +1,20 @@
+# Table of contents
+
+<!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
+- [Table of contents](#table-of-contents)
+- [Name](#name)
+- [Naming Rational](#naming-rational)
+- [Logomark](#logomark)
+<!-- TOC END -->
+
+# Name
+Rome
+
+# Naming Rational
+With `Sparta`, `Athens` and `Acropolis`, we have built a basic, but functional governance and media/content distribution system.
+
+Rome is scheduled to be a larger release in terms of scope and with a longer release cycle. Thus it makes sense to "leave" ancient Greece, and move to another important location in the evolution of democratic principles and the rule of law.
+
+# Logomark
+
+<p align="center"><img src="img/rome-art.png"></p>

BIN
testnets/rome/branding/img/rome-art.png