Merge remote-tracking branch 'origin/master' into mateus

Conflicts:
	Querys/q8/query8.2.sql
	scripts/makeViews.py