Add contact and faq, + video on homepage
fix merge conflict