TOS, quick fixes, text
bug fixes, layout updates, typos, and many good stuff
Merge branch 'develop' into staging
dist
Merge branch 'staging'