support also <name>=<factory statement> in the mappings (but you have to use ';' instead of ':' in the factory statement since the ':' is already used by the mapping)
make sure the factories are executed after the definition of the variables, in the order specified
Merge branch 'nckw_discrete-nuisance-parameters_24_07_2013' of github.com:nucleosynthesis/HiggsAnalysis-CombinedLimit

Conflicts:
	python/DatacardParser.py
Update README.md

Added recipe to merge conflicting pull requests.
Merge pull request #14 from gpetruc/MultiSignalModel-extras

support also <name>=<factory statement> in the mappings
Pre and post fit shapes and uncertainties
support for new naming scheme
print also prefit
print prefit only if -u
Fix weight issue
putting doHess as doHesse option rather than ndim
Merge branch 'fix-non-uniform-binned-generation' of https://github.com/gpetruc/HiggsAnalysis-CombinedLimit

Conflicts:
	python/DatacardParser.py
	src/MaxLikelihoodFit.cc