Development

Merging all of the remaining changes still on dev into master.