Conditioning

This fixes the merge conflict with the current develop branch and also includes my changes to the conditioning and stability lab. Most of the changes listed are commits from develop that haven't been pulled to your branch.