Some changes.
Merge branch 'master' of github.com:dohnto/CDP

Conflicts:
	documents/report/planning/planning.tex