nmssmmanual: reordered names.
set Z3 violating paramters to zero in main-nmssm.cpp.
Merge branch 'nmssm2' of https://github.com/Expander/softsusy
warn if Z3 == true and mu' or xiF are set non-zero
setting mu, Bmu, xiS at MX if SoftHiggsOut == true
bug fix: use NMSSM semi-sugra if Z3 == true to not constrain mS2
Merge branch 'master' into nmssm2
bug fix: inputParameters(53) is already a squared mass
adding check for <S> == 0 if SoftHiggsOut == true
bug fix: Bmu and xiS must trigger extended sugra

Since our (NMSSM) mSugra functions do not set Bmu and xiF, we have
to trigger an extended sugra condition if the user has set Bmu or
xiS to a non-zero value
Merge branch 'nmssm2' into bugfix-softhiggsout

Conflicts:
	src/main-nmssm.cpp
Merge branch 'nmssm2' of https://github.com/Expander/softsusy into officialTag
Merge branch 'nmssm2' of https://github.com/Expander/softsusy
Merge branch 'master' into officialTag
bug fix: determine value of softsusy::Z3 before using it
Merge branch 'nmssm2' of https://github.com/Expander/softsusy
bug-fixed output file.
Merge branch 'master' into officialTag