minor fixes, some todos, rephrase 2.1 and 2.2 to present tense
Merge branch 'master' into lukas

Conflicts:
	icse2014/icse-progfun.tex