Education content
Merge branch 'feature/education' into develop

* feature/education:
  Education content