Merge pull request #20 from threefoldtech/development

Merge from Development

content/news/news3/post3.md

@@ -2,7 +2,7 @@
 id: threefold_news3
 title: Community update call
 tags: event
-image: ./post3.jpeg
+image: ./post3.png
 image_caption: community call
 excerpt: It’s the end of October and a lot has gone on this month.
 author: sam_taggart

content/news/news4/post4.md

@@ -2,7 +2,7 @@
 id: threefold_news4
 title: ThreeFold Grid 2.3 Release
 tags: tech, feature
-image: ./post4.jpeg
+image: ./post4.png
 image_caption: threefold tech
 excerpt: The release introduces some improvements to the grid’s stability, new features and more.
 author: sam_taggart

content/news/news5/post5.md

@@ -2,7 +2,7 @@
 id: threefold_news5
 title: ThreeFold at Barcelona Blockchain Week
 tags: event
-image: ./post5.jpeg
+image: ./post5.png
 image_caption: threefold foundation
 excerpt: On 6th October at 1pm CEST our very own rocket scientist Weynand Kuijpers will be representing ThreeFold.
 author: sam_taggart

content/news/news6/post6.md

@@ -0,0 +1,17 @@
+---
+id: threefold_news6
+title: ThreeFold partners with Presearch
+tags: announcement
+image: ./post6.png
+image_caption: threefold foundation
+excerpt: We are thrilled to announce a collaborative partnership with Presearch.
+author: sam_taggart
+created: 2020-11-27
+---
+
+
+# ThreeFold partners with Presearch
+
+We are thrilled to announce a collaborative partnership with Presearch, a community-powered, decentralized search engine that provides better results while protecting your privacy and rewarding you when you search!
+
+You can get involved with Presearch community here: https://t.me/presearchnews

content/person/adnan_fatayerji/adnan_fatayerji.md

@@ -2,7 +2,7 @@
 id: adnan_fatayerji
 name: Adnan Fatayerji
 rank: 4
-memberships: ambassador, farmer, gridcouncil, threefold_foundation
+memberships: ambassador, farmer, threefold_foundation
 bio: Honored to be part of a team that has the potential to make the world a better place by connecting billions of people to a new, accessible, data sovereign and environmentally conscious internet. An international entrepreneur and part of a diverse team of innovators redefining the foundation of the internet. Adnan has been based in the United Arab Emirates for the past 20 years, during which he has built successful grass-root businesses and invested startups in various sectors. At ThreeFold Adnan is responsible for driving the ThreeFold Foundation Ecosystem. Adnan is also the CEO of the @Mazraa Cooperative which is a founding farm and P2P Cloud Capacity provider on the ThreeFold Network.
 excerpt: An international entrepreneur and part of a diverse team of innovators.
 linkedin: https://www.linkedin.com/in/adnansf/

content/person/ahmed_thabet/ahmed_thabet.md

@@ -2,7 +2,7 @@
 id: ahmed_thabet
 name: Ahmed Thabet
 rank: 3
-memberships: threefold_tech, techcouncil
+memberships: threefold_tech
 bio: I believe that life is a chance to grow a soul and programming is one of my means towards that goal. I want to build beautiful applications that don't productize the user or invade their privacy. Giving them their freedom back and complete control over their data. What I've seen in threefold for ~4+ years is lots of great values I'd like to have in this world. I'm mainly involved in the development user-facing technologies e.g SDK, wikis, websites, and infrastructure setup of Threefold.
 excerpt: Wants to build beautiful applications that don't invade users privacy.
 linkedin: https://www.linkedin.com/in/ahmed-te-youssef/

content/person/andreas_hartl/andreas_hartl.md

@@ -2,7 +2,7 @@
 id: andreas_hartl
 name: Andreas Hartl
 rank: 3
-memberships: threefold_tech, gridcouncil, ambassador
+memberships: threefold_tech, ambassador
 bio: Passionate to change the Internet back to what is was intended to be - unbiased and assessable for all everywhere independent of race, color and religion. Grateful to work in a team that strives to make that change happen. Gathered experience in various tech companies over the years being in charge of local and international business. Working with people, building trustful relationships and empowering people whenever possible is a big part of my values.
 excerpt: Passionate to change the Internet back to what is was intended to be.
 linkedin: https://www.linkedin.com/in/andreas-hartl-4330b8b/

content/person/anna_allen/anna_allen.md

@@ -2,7 +2,7 @@
 id: anna_allen
 name: Anna Allen
 rank: 3
-memberships: guardian
+memberships: ambassador
 bio: Anna has developed “Solutions of Harmony for the Highest Good” by applying her natural gifts, formal education, professional acumen, and miraculous experiences for almost three decades. As a Social Scientist, she is Globally known as a renowned Advisor, Author, & Alchemist to leaders, entrepreneurs, and influencers alike.
 excerpt: A Social Scientist, she is Globally known as a renowned Advisor, Author, & Alchemist.
 linkedin: https://www.linkedin.com/in/annanaturalista/

content/person/benjelloun_oussama/benjelloun_oussama.md

@@ -7,7 +7,7 @@ bio: Oussama is a globetrotter that advocates for equality and inclusive communi
 excerpt: Blockchain Ecosystem development Lead
 linkedin: https://www.linkedin.com/in/oussama-benjelloun-110b51128/
 websites: https://threefold.io/, https://www.mazraa.io/
-image: ./benjelloun_oussama.jpg
+image: ./benjelloun_oussama.png
 project_ids: threefold_foundation
 countries: 
 cities: 

content/person/christophe_de_carvalho/christophe_de_carvalho.md

@@ -2,7 +2,7 @@
 id: christophe_de_carvalho_pereira_martins
 name: Christophe de Carvalho Pereira Martins
 rank: 3
-memberships: threefold_tech, techcouncil, gridcouncil
+memberships: threefold_tech
 bio: I am a passionate developer who likes to travel the world. Trying to improve the world around me using technology is one of my goals. I believe the web needs to evolve into a more decentralized and fair network. I've been involved with the development of the threefold ecosystem since it's creation and I'm contributing to the technical side of things on a daily basis.
 excerpt: Passionate developer who likes to travel the world.
 linkedin: https://www.linkedin.com/in/christophe-de-carvalho-pereira-martins-919504a1/

content/person/dave_de_belder/dave_de_belder.md

@@ -2,7 +2,7 @@
 id: dave_de_belder
 name: Dave De Belder
 rank: 3
-memberships: ambassador, guardian
+memberships: ambassador
 bio: As the michelin star chef, Dave has always been very conscious about food and how it ties in with spirituality, healing and peoples conscience. Dave has worked in the best kitchens this world has to offer. Elbulli (ES), Librije (NL), El Celler de Can Roca (ES) and his own Godevaart (BE) & Cara & Co (AU).
 excerpt: Michelin star chef, conscious about food and how it ties in with spirituality and healing.
 linkedin: 

content/person/dimitrios_dermentzioglou/dimitrios_dermentzioglou.md

@@ -2,7 +2,7 @@
 id: dimitrios_dermentzioglou
 name: Dimitrios Dermentzioglou
 rank: 4
-memberships: ambassador, guardian
+memberships: ambassador
 bio: It is only on maps that borders exist between humans. We are one world, one race, we carry one song. Dimitrios is the founder of The Music Medicine, a project committed to cultivating Global Joy & Harmony, through the use and study of Music and Performing Arts as tools of Human Development and Self-Healing. Medical Ethnomusicologist, Music Therapist, Musician, Listener and Conductor, Dimitrios has a more than three-decade experience in the arts of Music and Celebration, studying their beneficial effects in Mind, Body, Soul and Social interaction.
 excerpt: Founder of The Music Medicine, a project committed to cultivating Global Joy & Harmony.
 linkedin: 

content/person/isabelle_peeters/isabelle_peeters.md

@@ -2,7 +2,7 @@
 id: isabelle_peeters
 name: Isabelle Peeters
 rank: 5
-memberships: guardian
+memberships: ambassador
 bio: Isabelle is a fun-loving person, besides being an advit evangelist of the ThreeFold Movement she is the owner of the Veda boats and hosts retreats on the beautiful river Nile. Everything Isabella does comes from the heart with an enormous amount of passion. Her dreams is to help people grow in awareness, and make the world a more colorful and peaceful place by doing so.
 excerpt: Isabelle is a fun-loving person, besides being an advit evangelist of the ThreeFold Movement.
 linkedin: https://www.linkedin.com/in/isabelle-peeters-54305589/

content/person/jan_de_landtsheer/jan_de_landtsheer.md

@@ -2,7 +2,7 @@
 id: jan_de_landtsheer
 name: Jan De Landtsheer
 rank: 4
-memberships: threefold_tech, techcouncil, gridcouncil
+memberships: threefold_tech
 bio: Wandering the Net since it's inception (www wasn't even a thing back then... and yes, I'm that old), I have experienced the (r)evolution of the Internet in steps going backward in terms of accessibility, bias and width. It seems to me, by the effect of personlized search, directed ads, filtered and hidden information, that the Internet has become so much smaller, narrowing and enforcing biased views. That needs to be addressed. The Net needs to become that vast resource of unbiased knowledge, so that people can start thinking for themselves again. That's why I'm here, to be part of a group of guardians who's purpose is to equalize all views so that people can really understand viewpoints instead of being just judgemental. Techie at heart, having lived professionally in the tech basements of the Internet, I can help and I will help. Education for all is the only path to a better world. Count me in.
 excerpt: Techie at heart, having lived professionally in the tech basements of the Internet.
 linkedin: https://www.linkedin.com/in/jand2/

content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md

@@ -2,7 +2,7 @@
 id: kristof_de_spiegeleer
 name: Kristof de Spiegeleer
 rank: 4
-memberships: ambassador, farmer, gridcouncil, threefold_foundation, threefold_tech
+memberships: ambassador, farmer, threefold_foundation, threefold_tech
 bio: Humanist & motivated entrepreneur, passionate to help make the world a better place. Kristof strongly believes there is need for a neutral internet owned by millions.
 excerpt: Nerd engineer, humanist & motivated entrepreneur.
 linkedin: https://www.linkedin.com/in/despiegk/

content/person/lee_smet/lee_smet.md

@@ -2,7 +2,7 @@
 id: lee_smet
 name: Lee Smet
 rank: 3
-memberships: threefold_tech, techcouncil
+memberships: threefold_tech
 bio: In order to have a nice planet to live on for the next decades, we need to preserve what we have now. This means we need to stop wasting scarce resources, and move towards a more sustainable ecosystem. If existing technology can not, or refuses to become greener, then we will need to create this technology from scratch.
 excerpt: In order to have a nice planet to live on for the next decades, we need to preserve what we have now.
 linkedin: https://www.linkedin.com/in/lee-smet-4a279a136/

content/person/michael_wellesley_wesley/michael_wellesley_wesley.md

@@ -2,7 +2,7 @@
 id: michael_wellesley_wesley
 name: Michael Wellesley-Wesley
 rank: 4
-memberships: threefold_foundation, ambassador, farmer, project
+memberships: ambassador, farmer, project
 bio: Michael is a seasoned veteran with over 30 years of experience working in both the US and UK. He is a former CEO of public and private media and technology companies, most recently of NASDAQ quoted ChyronHego. He is Director and Founder of Inogesis, a London-based accelerator that enables blue-chip organizations to harness the power of disruptive technology. He is a Director of Conduce Technology, an innovative pioneer in the field of data visualisation based in California and also an Advisor and Venture Investor in Alpha Venture Partners, a technology-focused venture capital firm based in New York. Michael has served as Managing Director of Wit Soundview Ventures, COO of Data Broadcasting Corporation and Director of Financial News Network. He founded and served as Director of London-based boutique technology investment bank Stephen Rose and Partners. I fully support and endorse the the ThreeFold Foundation vision of a decentralised, sustainable and greener internet that provides lower cost computational power and connectivity to large groups of people who , until today, have been excluded from the benefits and possibilities inherent in the digital revolution.
 excerpt: Michael is a seasoned veteran with over 30 years of experience working in both the US and UK.
 linkedin: https://www.linkedin.com/in/michaelww/

content/person/owen_kemp/owen_kemp.md

@@ -2,7 +2,7 @@
 id: own_kemp
 name: Owen Kemp
 rank: 4
-memberships: threefold_foundation
+memberships: threefold_tech
 bio: In all walks of life, Owen looks for an equitable exchange of value and believes in doing everything in a socially responsible way. He loves working with diverse teams as they best represent our amazing planet. Emerging markets have been his passion and his profession. he has travelled to almost 150 countries helping local teams to flourish. Once described as an optimist and anarchist. he has humour and enjoys doing things in an unconventional way.
 excerpt: Founder at ThreeFold Tech
 linkedin: https://www.linkedin.com/in/owen-kemp-b6b5a113/

content/person/rishi_chidananda/rishi_chidananda.md

@@ -2,7 +2,7 @@
 id: rishi_chidananda
 name: Rishi Chidananda
 rank: 5
-memberships: threefold_foundation
+memberships: ambassador
 bio: Rishi Chidananda has spent the latter part of his life, as a monk, studying the philosophical traditions of India, gaining deep insights into its hidden meaning and timeless practices that are particularly relevant in this day and age. Before entering the spiritual path, he was a successful Investment Banker and entrepreneur. Philosophical teachings contained within ancient scriptures such as the Bhagavad Gita had a significant impact on how he viewed the world and changed the way he approached life. As a former Investment Banker and Entrepreneur, he uses his experience to easily articulate the philosophical teachings of the East in a meaningful way for those looking to bridge the gap between Western and Eastern philosophies.
 excerpt: Monk, studying the philosophical traditions of India, gaining deep insights into its hidden meaning.
 linkedin: 

content/person/rob_van_mieghem/rob_van_mieghem.md

@@ -2,7 +2,7 @@
 id: rob_van_mieghem
 name: Rob Van Mieghem
 rank: 3
-memberships: threefold_tech, techcouncil
+memberships: threefold_tech
 bio: Equality of opportunity is a fundamental right in my opinion. So is privacy that goes beyond being a personal right as it is a necessity for democracy to function. A better world is something that starts with yourself. Technology today does not sufficiently suppport my personal believes of how a bettter world might look like, especially not how it is made available to the majority of the world population. I'm a nerd and proud of it so let's start doing what is right.
 excerpt: Technology today does not sufficiently suppport my personal believes of how a bettter world might look like.
 linkedin: https://www.linkedin.com/in/robvanmieghem/

content/person/sophie_monpeyssen/sophie_monpeyssen.md

@@ -2,7 +2,7 @@
 id: sophie_monpeyssen
 name: Sophie Monpeyssen
 rank: 4
-memberships: guardian, ambassador
+memberships: ambassador
 bio: Sophie has devoted herself to the study of healthcare philosophies and practices that harmonize mind, body and spirit, including sophrology and massage. She is a graduate of the Sorbonne holding an MA in Musicology, Psychology and Pedagogy. Inspired by her training with Spiritual Elders since 2007, Sophie coaches companies and individuals to become the best version of themselves.
 excerpt: Co-Founder & CEO - Le Ciel Foundation
 linkedin: https://www.linkedin.com/in/sophie-monpeyssen-a92747179/

src/templates/People.vue

@@ -6,8 +6,8 @@
     >
       <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
         <Team
-          title="TEAM"
-          description="The heartbeat behind the ThreeFold Movement."
+          title="THREEFOLD PEOPLE"
+          description="The heartbeat behind the ThreeFold Movement"
           :objects="$page.entries.edges"
           :tags="$page.memberships.edges"
           tagsField="memberships"

src/templates/Projects.vue

@@ -7,7 +7,7 @@
       <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
         <Team
           title="THREEFOLD PARTNERS"
-          description="The heartbeat behind the ThreeFold Movement."
+          description="The heartbeat behind the ThreeFold Movement"
           :objects="$page.entries.edges"
           :tags="$page.memberships.edges"
           tagsField="tags"