Adjusted settings for putting admin on a separate subdomain.
Updated packages.
Resolved merge conflicts.
Updated wordpress.
Adjusted beta htaccess.
Updated siteurl for beta.
Removed attachment and timeline event form contnet that can appear in the aside. We can add them back if necessary, but they're not being used now.
Updated machado branch to develop.
Updated lock file.
Updated composer.lock.
Merge branch 'develop' into admin-sep-domain
Merge branch 'admin-sep-domain' into develop