Merge current development into master so that master can be used as the primary deployment.