A method for waving or straightening and simultaneously conditioning hair and a hair waving composition method for use in this