Latest Changes

Here are the latest functional changes to the code that is live on the site. Please make sure to merge this in before any patches are applied.