updated templates for public blueprint, removed unnecessary templates, fixed link in faq.html, added tests for all static pages
updated merge conflicts in faq.html
Merge pull request #78 from mjhea0/develop

updated public blueprint templates