tring a merge

Merge branch 'developement' of https://github.com/kkmann/cme into developement

Conflicts:
	R/cme.R
	R/sim.R
	demo/regularization.R
	doc/presentation/bias-concordance.tex
	inst/doc/presentation/bias.pdf
	inst/doc/presentation/bias.tex
	out.txt
merging

Merge branch 'master' of https://github.com/kkmann/cme

Conflicts:
	doc/presentation/bias-concordance.tex
	inst/doc/presentation/bias.pdf
	inst/doc/presentation/bias.tex