customer osv -> user/guest
Merge remote-tracking branch 'origin/master'

Conflicts:
	Report/Chapters/userDesign.tex