Merge branch 'stage' of github.com:Adventech/sabbath-school-resources…

… into stage

src/en/devo/test/content/01/teacher-comments.md

@@ -33,11 +33,11 @@ The Adventist Understanding of the Great Controversy. Seventh-day Adventists hav
 
 While other Christians also believe in the fall of Lucifer and of Adam and, to some extent, the cosmic conflict between God and Satan, Adventists have articulated these concepts in the form of a unique doctrine, encapsulated in fundamental belief 8:
 
-All humanity is now involved in a great controversy between Christ and Satan regarding the character of God, His law, and His sovereignty over the universe. This conflict originated in heaven when a created being, endowed with freedom of choice, in self-exaltation became Satan, God’s adversary, and led into rebellion a portion of the angels. He introduced the spirit of rebellion into this world when he led Adam and Eve into sin. This human sin resulted in the distortion of the image of God in humanity, the disordering of the created world, and its eventual devastation at the time of the global flood, as presented in the historical account of Genesis 1–11. Observed by the whole creation, this world became the arena of the universal conflict, out of which the God of love will ultimately be vindicated. To assist His people in this controversy, Christ sends the Holy Spirit and the loyal angels to guide, protect, and sustain them in the way of salvation.—Fundamental Belief 8, “The Great Controversy,” https://www.adventist.org/the-great-controversy/.
+All humanity is now involved in a great controversy between Christ and Satan regarding the character of God, His law, and His sovereignty over the universe. This conflict originated in heaven when a created being, endowed with freedom of choice, in self-exaltation became Satan, God’s adversary, and led into rebellion a portion of the angels. He introduced the spirit of rebellion into this world when he led Adam and Eve into sin. This human sin resulted in the distortion of the image of God in humanity, the disordering of the created world, and its eventual devastation at the time of the global flood, as presented in the historical account of Genesis 1–11. Observed by the whole creation, this world became the arena of the universal conflict, out of which the God of love will ultimately be vindicated. To assist His people in this controversy, Christ sends the Holy Spirit and the loyal angels to guide, protect, and sustain them in the way of salvation.—Fundamental Belief 8, “The Great Controversy,” https://sabbath-school-resources-media.adventech.io/en/devo/test/assets/ebd5689fd27b2cc42005435410566463ec1012842407de8510d399294b538d1b
 
 The biblical teaching of humanity’s fall into sin is also present in fundamental belief 7:
 
-Man and woman were made in the image of God with individuality, the power and freedom to think and to do. Though created free beings, each is an indivisible unity of body, mind, and spirit, dependent upon God for life and breath and all else. When our first parents disobeyed God, they denied their dependence upon Him and fell from their high position. The image of God in them was marred and they became subject to death. Their descendants share this fallen nature and its consequences. They are born with weaknesses and tendencies to evil. But God in Christ reconciled the world to Himself and by His Spirit restores in penitent mortals the image of their Maker. Created for the glory of God, they are called to love Him and one another, and to care for their environment.—Fundamental belief 7, “Nature of Humanity,” https://www.adventist.org/nature-of-humanity/.
+Man and woman were made in the image of God with individuality, the power and freedom to think and to do. Though created free beings, each is an indivisible unity of body, mind, and spirit, dependent upon God for life and breath and all else. When our first parents disobeyed God, they denied their dependence upon Him and fell from their high position. The image of God in them was marred and they became subject to death. Their descendants share this fallen nature and its consequences. They are born with weaknesses and tendencies to evil. But God in Christ reconciled the world to Himself and by His Spirit restores in penitent mortals the image of their Maker. Created for the glory of God, they are called to love Him and one another, and to care for their environment.—Fundamental belief 7, “Nature of Humanity,” https://sabbath-school-resources-media.adventech.io/en/devo/test/assets/1bb9f03ee62062944e7ec240cdc0d2b9439360ea2c51faadbf3bbce260f994e0
 
 Two additional aspects of the Adventist doctrine of the great controversy deserve our consideration: (1) the origin of the great controversy theme and (2) its historicity.
 

src/en/devo/test/content/blocks/story.md

@@ -7,13 +7,13 @@ a b c d e f
 
 ;;;
 ^^^
-![](story2.png)
+![](https://sabbath-school-resources-media.adventech.io/en/devo/test/content/blocks/story2.png)
 {"style":{"text":{"color": "#ffffff"}}}
 In the _**beginning**_, before there were white ^[fluffy]({"style":{"text":{"color":"#333333", "typeface":"RobotoSlab-Black"}}}) clouds or fuzzy caterpillars, there was God. Before there were twinkly stars or an ocean so blue, God created a special place for you. There was so much He would do. In _(count with your fingers to six)_ one... two... three... four... five... six days the world would be perfect and new.  God would fill the earth with colors to see: red, yellow, blue, and green. There would be new sounds to hear and tasty food to eat. Best of all would be the friends He would meet. God is so good, and everything He made for us is good.
 ^^^
 ^^^
 {"style":{"image":{"storyTextAlign": "top"}}}
-![](story1.png)
+![](https://sabbath-school-resources-media.adventech.io/en/devo/test/content/blocks/story1.png)
 {"style":{"text":{"color": "#000000"}}}
 In the beginning the earth was covered in water. There were no playful dolphins or great big whales; no boats ready to set sail. God wanted to create a beautiful place for you to be, with animals big _(arms out wide)_ and small _(hands close together)_ for you to see. He wanted to make people like you (point to child) and like me _(point to self)_. So He did. God is so good, and everything He made for us is good. In the beginning the earth was empty and dark. There were no twinkling stars _(wiggle fingers)_ shining in the darkness; no owls hooting from their nests _(hoo-hoo)_. God wanted to create a wonderful world for you to see, filled with light for both day and night. He wanted to make a special day for time with you. So He did. God is so good, and everything He made for us is good.
 ^^^