Moved terminology up and added figure
Merge branch 'master' of https://github.com/dohnto/CDP

Conflicts:
	documents/report/introduction/introduction.tex