Updating demos and pages site
fixing merge conflicts
fixing merge conflicts