Merge branch 'master' of https://github.com/fparker9676/newSynergy into worldwide
rabbit trail
fix conflicts
video imbed, text edit, footer build
update
Merge pull request #18 from fparker9676/worldwide

Worldwide