Changed the sherpa2.spec and toolfile to implement the newest sherpa version 2.1.0, this includes a new patchfile for lhapdf to work in the correct way
Merge pull request #592 from degano/sherpa2_to_sherpa_71X

Move sherpa2 to sherpa and upgrade to 2.1.0