addressed 2nd comments posteriors.
Merge branch 'master' into extractionFromPosteriors

Conflicts:
	.aspell.en.prepl
	.aspell.en.pws
	statisticalMachineTranslation.tex
	thesis.tex