Merge new user guide back to Dev