Fixed merge collisions
Added FAQ and footer to thank you page.
Merge branch 'feature/thank-you-page' into develop