Part of Mihai's edits.
Merge branch 'master' of https://github.com/cmhill/BIBM2013

Conflicts:
	mlap.tex