typo2
Merge branch 'develop' into staging
fixed marketing and added author
styled autor