Corrections in bib and wording changed in WMS
Merge remote-tracking branch 'origin/master'

Conflicts:
	survey-work.tex