SM checked for SJpsiK and SJPsiPhi.
Minor changes in preprocessor and variable definitions.
Merge branch 'master' of https://github.com/silvest/SusyFit.git