Merge origin/master

Conflicts:
	SATIS.sql