minor fixes in text
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/paperdraft/paper_draft.pdf