made some tasquid specific content changes
fixed conflict
Merge branch 'staging' into production