Dev to Master

Just merge the new changed to the page structure, not the url differences between deployed and local.