jd proofreading
Merge branch 'computelfinal' into computel

Conflicts:
	docs/ComputEL/computel_2014_thematic.tex