1.9, 1.10 and 1.11 done
Merge branch 'master' of https://github.com/joachimvig/statml
Merge branch 'master' of https://github.com/andreasbock/statml
minor changes
minor changes again
Merge branch 'master' of https://github.com/andreasbock/statml

Conflicts:
	probandparameter.py
II.1.1: should be done now, fixed padding issue
II.1.2: MAP seems to be working with the corrections from TA (padding)