Typo fixes
Stashing changes
Merge branch 'short_version' of https://github.com/sjyk/sampleclean-matview into short_version

Conflicts:
	architecture.tex
	conclusion.tex
	introduction.tex
	sampling.tex